Merge "Add meta=userinfo&uiprop=latestcontrib"

[lhc/web/wiklou.git] / includes / installer / WebInstaller.php

diff --git a/includes/installer/WebInstaller.php b/includes/installer/WebInstaller.php
index f555c0f..2d12e62 100644 (file)
--- a/includes/installer/WebInstaller.php
+++ b/includes/installer/WebInstaller.php
@@ -140,9 +140,9 @@ class WebInstaller extends Installer {
                $this->request = $request;
 
                // Add parser hooks
-               global $wgParser;
-               $wgParser->setHook( 'downloadlink', [ $this, 'downloadLinkHook' ] );
-               $wgParser->setHook( 'doclink', [ $this, 'docLink' ] );
+               $parser = MediaWikiServices::getInstance()->getParser();
+               $parser->setHook( 'downloadlink', [ $this, 'downloadLinkHook' ] );
+               $parser->setHook( 'doclink', [ $this, 'docLink' ] );
        }
 
        /**
@@ -920,7 +920,7 @@ class WebInstaller extends Installer {
                if ( !isset( $params['labelAttribs'] ) ) {
                        $params['labelAttribs'] = [];
                }
-               $labelText = $params['rawtext'] ?? $this->parse( wfMessage( $params['label'] )->text() );
+               $labelText = $params['rawtext'] ?? $this->parse( wfMessage( $params['label'] )->plain() );
 
                return "<div class=\"config-input-check\">\n" .
                        $params['help'] .
@@ -1072,12 +1072,10 @@ class WebInstaller extends Installer {
                        if ( $value === null ) {
                                // Checkbox?
                                $this->setVar( $name, false );
+                       } elseif ( stripos( $name, 'password' ) !== false ) {
+                               $this->setPassword( $name, $value );
                        } else {
-                               if ( stripos( $name, 'password' ) !== false ) {
-                                       $this->setPassword( $name, $value );
-                               } else {
-                                       $this->setVar( $name, $value );
-                               }
+                               $this->setVar( $name, $value );
                        }
                }